Adding tests for the new conditional model