* Fix test according to Martins comment in 31286 * Use core features rather than integration specific * Fix populate options test
* Fix test according to Martins comment in 31286 * Use core features rather than integration specific * Fix populate options test