bz#974098 verified - tests fixed
Merge pull request #619 from alda519/sys_tests_fixed

2 system tests fixed