Make tests polymorphic