Removed superfluous tests