Moved Tests to test for more consistent naming scheme