Cleaned up names of test functions to be more consistent