Wored further on test suite, removed a few unecessary files