Clean up assembly test a bit, with gmock