Clean up. Removed unused tests in sources, etc