Minor improvements in test suite