Improved unit tests
Extract ParameterSanitiserSpy
Put imports on a serious diet
re-add test