Almost done with checkin testcase