Updated the test frameworks a bit