More fixes to fixture loading in tests