Add freeze and unfreeze methods
Update tests for freeze/unfreeze modes