Refactor tests, hope to get async right.