finished the changes to the combination testing