Moved testIDs into tests
Fix minor bugs