more fixes for the tests on platform.