[devtools cleanup] Port a couple tests to BYO test