Implemented issue #1034: branch and path coverage