finally fix the final tests with the MASQ fix