Fixed a couple of tests broken by capfirst changes.