move api to new version and add tests

Oh, I remember I have changed, Okay, I'd like to do again in following commits :)