Refactor tests: comments in single module, utilities in separate directory