Adapt tests to new testing frameworks