Removed redundant/outdated tests