cleanup
added some asynchronous tests