fixing unit test
unit test fix
Merge branch 'master' into e2e

getting latest tests
added phantomJS successfully!