Added some utility functions to wrapper; developed test a bit further