Handle the case gracefully where tests were never started (due to import errors for example)
No need to try this hard to clean up :-) - will get a new datastore on different runs anyway
Bumped version for minor release
Only enable datastore / taskqueue if requested
Bumped version for minor release