Changes in test suite code