WIP improve test and get it passing on mono