Adopts latest RAP TestFixture changes

Change-Id: I454a873098e0e90852f73333217bcff66aaa3548