Swapped x and y order in several methods.
Modified test cases to better fit new board layout.