further fixes, test enhancements