Added some wrapper methods to potentially simplify the public api
Fixed testing to use more ya methods.