Revert "todo more failing 5.18 bc tests"

This reverts commit 68318ac15de6eb28debaa4154e3b7778c1c63057.
needed a make clean, all those tests pass.