Full merge & test fixes

Includes #156 & #157

Some test fixes were needed, mostly linked with latest data-system.