Remove comments
Fix tests
Fix error message
Fix errors