Update unit tests after code review