various general fixes + improved unit & functional tests
fix issues related to wisp name containing spaces, should fix #5
+ other minor improvments to functional tests