Modified some tests

and renamed some files, and removed some tests that were just stupid.