further fixes, test enhancements, additional tests