renamed some test to be consistent with others