Merge "Modify tests to use executable memory."