Added rewriting of 19 logs during update to 21
Minor code style fixes in test