Work on commands, added command test class