Need to clean up my column and row tests