All tests passing with new Commander