Update broken test, also update SimpleTest loading code to trunk.