Removed commented code
Changed nodenames to make tests independent