Fixes to help and test