     //--------------------------------------------------------------------------
     // test_multiplication
     func test_multiplication() {
-        let matrix = MatrixType<Float>(3, 2, with: [0, -1, 2, -3, 4, 5])
+        let matrix = SwiftRT.Matrix<Float>(3, 2, with: [0, -1, 2, -3, 4, 5])
         let values = (matrix * matrix).flatArray
         let expected: [Float] = (0...5).map { Float($0 * $0) }
         XCTAssert(values == expected)

    // test_neg
    func test_neg() {
        let range = 0..<6
        let matrix = MatrixType<Float>(3, 2, with: range)
        let expected: [Float] = range.map { -Float($0) }

        let values = matrix.neg().flatArray

    //--------------------------------------------------------------------------
    // testConcat
    func testConcat() {
        let t1 = SwiftRT.Matrix<Float>(2, 3, with: 1...6)
        let t2 = SwiftRT.Matrix<Float>(2, 3, with: 7...12)
        let c1 = t1.concat(t2)
//        XCTAssert(c1.extents == [4, 3])
        let c1Expected: [Float] = [
