Fix copy-paste typo
Update tests
More tests