Deleted MathUtils and changed tests