Making these tests conditional