Fixes for market tests on #42