more test exp improvements