Updates for version 0.6 and code coverage