Remove asynchrony from tests where its not needed