Minor fixes - disable the test and change the field label settings.