shuffle things about to get tests running :(
fix hanging tests, kill on fail