Fixed error after name change, plus added tests for row and column size (failing for now)