cleaning up testing code
fixing up test suite, now successfully testing Listeners receive updates