Brms - another batch of test changes

Tweaking some of the tests, extending tests for DRL code completion.