added new tests, framework updates