reorganize tests slightly