Fixed a null pointer exception. Fixed some tests to use row/column in the proper order.