Updated test, Cleanup, fixed sub commands