bNodes support complete. More unit tests added