temp fixes for different test types