Refactor tests for randomize order
Refactor to remove sinatra and cli classes