Fix valgrind large_object_space_test

Also some cleanup.

Change-Id: I9c1a8093e6356f1b52e332009429b77fa5c1d448
2 files changed