refactor: minor tidy up
refactor: minor tidy up of tests