Tests refactored, load test for node added