More fixes for making base tsqa tests work