Added & removed more tests.