#6 fixed some tests and deleted some tests that do not make much sense