@ferjm are these tests looking ok? should I test additional cases?