BDD test progress

Making progress on BDD test passage.  This pull fixes the node feature (and likely a lot of other breaks)