Tidy code and remove unused accessor
BZ975 Add tests for DII