Updating tests for catkey.

Tests updated to handle catkey. @peetucket @lmcglohon