better categorisation of transformers
update classes and destructuring test names