more framework and testcase updates