Migrate to simpletest/simpletest