more tests for hub itself & move some stuff around