Fixed an issue with the Test code