Removed unused test classes & reworked command handling
Now really deleted unused test classes