cleaned up
Cleaned up tests