Merge "Add tests for more coverage of CheckoutCommand"