@Bouke I'm going to re-do the changes to the testing code given your suggested approach above. It's probably not worth reviewing the testing changes yet.