Minor updates in test suite