Merge "Added some extra tests for ORMRow class"