Updated tests
Removed old nodes