Cleanup node model and tests