Removed accidentally backported tests