Cleaned up some tests and removed test directory.