Removed unnecessary test logic