Added mAFlag, and made the test check with the last version that git checked in