Start re-working tests to match new class