a few fixes based on updated tests