Fix findNode and more tests