r826 - trunk/tests