Cleanup code and add async tests