Dicoverer tests and such
fix user relationships