Cleaned up test case name
Reorganized tests