Fix broken tests due to redesign