Upgraded test framework