fixes for mtest