reduce unit test verbosity
refactoring
merge with master branch