fixes for running combined tests