Cleaned up tests
Removed debug code