Reflect recent changes in tests