ERT-601: Minor fallout from test refactor.
Merge pull request #488 from joakim-hove/ERT-601-refactor-ExtendedTestCase

ERT-601: Minor fallout from test refactor.