Fix some scrutinizer issues
Better code coverage
Fix SensioLabsInsight violation