console style refactor
testsuite refactor