Removed unused clases; added tests.