merged back in other supposedly stable tests