Clean up...
Tests and classes