Cleans up tests

Reorganizes and renames tests for better organization and consistency