Fix failing system tests (from Chozen update)
Merge pull request #3237 from dextercowley/sys-tests-20140304

Fix failing system tests (from Chozen update)