Ico save, additional tests

Includes #995