Cleaned up testing
Cleanup