Merge "Tests for BP1->BP2 upgrade"