Clean up
Fix tests