Re-creating test cases, add Hub class