changes to object_test and figures
fixed merge problem