tidying up
more test coverage