More code and test updates.