Work for the day... almost all tests green except last one that needs
debugging as something weird is going on.