Update test suite

Forgot to update tests with recent code change