Added tests and Scoverage