Added make_cunique_ptr
Fixed order of variables in unit tests, make use of cunique_ptr