Working on test passing

Pushed final method body cloning to separate step