Remove extra tests. Follow-up to e19c5febcc60b355283b171173c122363a06c1cb