Version upgrade and test tweaks.