old
tidying up
refactor tests