modified unit tests'