Remove some unnecessary tests