Roll back :poop:y interop change
Remove dead method
Use test helpers
Enhance assertions