fixing tests on Magic branch