Master tests fixed