new version
added angular mocks