refactored node options + added tests