Added tests to prevent fieldname loosing for for current field