Some cleanup, start working on Matrix3 unit tests