Fixing TA-837 and adding test coverage generator module to collect coverage