Updated Test Framework