Was able to get all unit test working for moving to the new $.x concept.