Bugfix: unit-test was creating dirs in source directory.
Style fixes as suggested by tools.