Fixed command test, added more cases