Finished conversion API and tests (S11)