all four test cases in my main work. I'm pretty sure this is now complete.