Removing unecessary async. More tests.