More tests, working on async