Updated tests. Changed NoCheckout behaviour