Test updates and fixes