More consistent naming of unit tests