Quick fix to unit tests and rebased on latest version of master. Had to do this while merging the BaseApp refactor branch with this branch, so going ahead and upstreaming here but the changes are small so feel free to make the changes on your branch if you prefer.
Quick fix to unit tests and rebased on latest version of master. Had to do this while merging the BaseApp refactor branch with this branch, so going ahead and upstreaming here but the changes are small so feel free to make the changes on your branch if you prefer.