improve Fin instance, fix test
2 files changed