unit tests adapted to architectural change