Reorganize unit tests
Fix a leftover typo