Rename $volatile -> volatile
Add UTs