Removing unnecessary tests