Now that this test is assembly, make the checks a bit stronger.

This will be used for a followup patch.