fixes on MS async tests + rm trailing ws