Remove dir after tests in classes TestCache and TestMBTilesBuilder
Merge conflicts

Conflicts:
	landez/tests.py