Updated walshaw tests
FRLayout changes and tests for it