Removed none-implemented tests and none-needed deprecated include.