updated as per bryans comments; also tightened up clone tests