Add a test
Fix tests