Multiple changes to various files to get it to check correctly. Still failing for various reasons, not the least of which is that binary.test has magrittr pipes in it. Gotta get that fixed.