Updated test framework