Removed dependency on simpletest