Added CheckinApi and appropriate tests for edge cases