better test coverage (98% FWIW)