Done - 1st pass
tidying and add a few missed tests
tidying