Removed unrelated tests