Revert "Remove tests which no longer needed."

This reverts commit 1ab3babf29fa43de13008b1969d4effc0ee82900.