Adding data option to memory engine and tests