Writing tests for this is turning into a yak shave, moving on.