Changes to enable memory tests