Evening chill with more unit tests