Removing uncecessary tests