Minor improvements in Test suite