ISSUE-85 - Update test framework