unittests according to code guidelines
more re-formats