Removed Old Functionality Tests