Adjustments to memsource for better testing.