mrp: tests: msrp_tests, code cleanups