tweaked some method and test names to be more sensible