Add test, fix implementation
Re-add baseFieldDefinitions(), that was not the problem