Tidied up my impromptu 'testing' and the lib in general