Revert "More backend work for testing"

This reverts commit 06b6579408e945c1be1dac6a03c71966e65d32ed.