More fixes. simplest test passes now.