Changed naming to be more convenient
Updating comments
Added tests for wwrapper