Clean up. Memory model back to default.

Cleaned up some old test code so I could put memory model back to
default.