revised test
angular+jasmine+karma
merge