Remove templating, add node id to data directory

Also adds a custom data path into testing to randomly use a custom data
path