Reorganize some unit tests