WIP: fixes for testing, new capability + vnode testing