Removed redundant Tests and functions