Removed unrelated tests?