Complete update of unit tests following most recent refactoring