Fix issues in the Test classes