Add topic grouping to tests, 'core.request'
Make 'done' invocation depend on value of 'message'