Separate logic from conj
Update tests