Add test with an empty field name and fix to not save those