Cleanup, modified rascal test.