Fixed testsuite to reflect changes in YaPI