Test infrastructure and changes of dal structure