full support for Api v2 & added tests