Add node type view, more tests and formatting