Lets revert this test too. I think it should be handled another way.