Cleanup and add more tests
Recognition produces params