And updated the tests to match as well.