Reorganize unit tests, split into several test suites
typo