Fixed Issues and Improvements in Task Test Classes