Converting unit tests to a canonical form — work in progress