All commands sanely working
Test data loader and minor fix