Make tests pass with interface{}