changed #remove to #destroy, updated/added tests