Bug fix and test cases/traceability matrix