Updating combined tests with new code