Renamed method addNode to add

small fixes and improvements
Added ContextTest