Remove basedir after tests
Adjust test based on disk accounting change