Added CBV login
Fixed tests for 2.6