fixed all but two tests