Fixing up auto tests