more fixups
fix tests