Changed the high-level framework back.

This ended up causing name collisions when running the tests.

Round 3 testing

Round 2 testing