Cleanup
Fix tests