Updating to handle stored test merge with config test better. Was missing some identifier copying.