checkin unit tests and modification