other unit tests patched to reflect refactorings