simple SDPVar tests. modified the canonicalization of an objective, so affine objectives are left untouched.
fixed merge conflict