Ert test run

Updated pull request. 

This should not be merged before the "revert has been reverted".