Added some cleanup
Added async test