Minor updates in Test Classes