Telling coveralls where .coverage file is located
Some more unit tests
Merge branch 'staging'