Updated MTAF with tests for CE 1.7.0.2