More testing changes...