Added new test cases.
Changes to runtime to support new test cases.