Fixes for code coverage and SensioLabs insight