rebase sdos-test on the svn mirror