Reorganize unit tests