Fixed failing tests due to change from name formatting from underscore to dash