Fixes to get the tests working after integrating the 'develop' branch.