Fix tests
Clean up testing