removed some tests which were extra and cleaned up certain tests.