Fixing test contexts