Update service provider to support timeouts
Move tests in their own namespace
Prepare version 0.2.1