modified unit tests