Make test suite nicer