first test and coveralls
fixing merge