Fixing tests
PhantomJS
Merge pull request #41 from alxdarksage/develop

Fixes for integration tests