Fix FieldPanel test failures