Improve conj and add tests