Fixed test: increased have_at_most values
Replaced deleted catkeys with new corresponding catkeys