Added code coverage and static analysis