Use simpletest instead
Too many changes in one commit...