More tests
Refactored params to a dictionary of Node for complex params values