cleaned up test method names and made them more consistent