Improve test props usage

**Description** Improve and encapsulate a bit how test props are being used. Akka should really have better support for this...
**Testing** Tests pass
**Coverage** Unchanged