Add test coverage and integrate to Travis
Fix merge w nightwatch