Reorganize tests for better separation