modified unit tests, code cleanup