Test updates and bugfixes.