fix tests, conversion stage 2