reinstated a few tests