Should have better test coverage now.