ZEF-7 Fixing tests that failed before