test suite with MAC changes included