Minor updates to test suite