Apart from mostly formatting changes, there look to be some logic changes in this class - any test coverage for the changes?