These are all the code changes and added test from @crocogorical, I've simply made a new branch to resolve merge conflicts and run local tests and add back some tests. Thanks SO much to @crocogorical for all the hard work, SO sorry for the very long delay in getting this code merged into master.
Coverage increased (+2.7%) to 92.354% when pulling 11190b207a3391773ef3623e2695188bca7c74f9 on crocogorical_tests into 14c01105abfa2cb3e39eb5a19b753c31ceb3063a on master.
These are all the code changes and added test from @crocogorical, I've simply made a new branch to resolve merge conflicts and run local tests and add back some tests. Thanks SO much to @crocogorical for all the hard work, SO sorry for the very long delay in getting this code merged into master.