Bug fix in Test()