Changing to unit tests. Have unit test for async. Will need to get rid of self_ pointers