Removed unnesessary tests