6:
 - tests and minor fixes