Fixing tests, improving A to C transformer