Fixed all of the tests to work with the commands