Sync tests with trunk