could you merge these? they allow about 1/3 of tests to pass

thanks
Matti