Modification of empty-fields-test method