Test Fixes

Copy-pasted tests were named incorrectly, fixing.
Revert "Framework Change"

This reverts commit c935632f08c0401d03467cfba11bcce109b9697c.