update tests for new test-utils
(some) code cleanup