Refactor to use noflo-test