Added scrutinizer for code coverage. Fixed some small issues