Reordered converter, added test cases