I'm worried this might be a regression, as you had to change a test assertion.

@bakura10 -- can you review?