[Exception] Make tests use new classes