Fix broken tests from identifiable refactor