Small cleanup - relates to #318
Add Fuchu test - references #323