Removed unnecessary tests