Merge "flatland: add 3:2 tests"