Fixed more Test cases for TBB and Serial paths.