System: attempting to fix system memory test
Merge pull request #2501 from daviddavis/temp/1371469229

System: attempting to fix system memory test