fix lately added tests that break on the FK constraints