Variable wrapper doc comments
Added tests and removed unused code