Fix memory tests. preparing to attempt fix of flows

Change-Id: I956fb9d0a8988ca27391e3071a689be54fc5b772