Fixed broken tests due to merge