@dantleech this tests exposes some problems with the current approach maybe