FIX: More consistent naming of methods and tests