hubs tests cleanup and new tests