fix unit tests for changes in this branch