Clean up
Tests added