Reorganize some tests