Change fieldNames to Iterable<String> + test