Updated tests to take account of factor rotations