As this is not actually used outside of the Hub, it really makes more sense to make this testing part of the hub testing. Also makes it easier to compile.
