Fix system test problems with Chosen
Merge pull request #3241 from dextercowley/sys-test-fixes-20140305

Fix system test problems with Chosen