adjust MonkeyTest to restructured modules