Etc Cleanup and more tests.