added tests (jasmine)
merge