Merge "Adding api tests for dvr routers"