Pulled all tests into one test. Removed some redundant tests. Rename.