Removed dependency for Q and better async testing.