Better, more stable tests for (bug 726057)