Adding v2 controller
Improved unit test coverage, fixed minor issues with V2 API