Edited the two test files so that simpletests run without error, although they don't test nearly enough.