Merge pull request #41 from keithw/adjust-memory-max-test

Merge pull request #41 from keithw/adjust-memory-max-test #28