Restructuring and renaming tests for better convention