Fixed tests (we switched x,y/y,x yet again... so another round of swapping all the columns and rows in the test setups)