Few more tests.
Enable branch cov measurements.
Fix few isssues.