updated tests and entities for @NodeEntity