moved the tests into their own folder so that I don't have to use the test_* naming anymore. Also, added some protection against misplaced spacers