Removed unnecessary code. Simpletest updated.