Added tests
Merge branch 'improve-coverage' into coveralls