#65 Bit of cleaning after move to shared_ptr
#65 Fix test with move to shared_ptr