Modify tests to comply with framework changes