Added cleanup after tests.
Tests now create their own working dirs and clean them up afterwards.
Checkstyle fixes