[test] Adjusting and adding tests to conform to Primus 2.x.x changes