Added code coverage and basic metrics