Fixed issues in unit-tests due to device table column change.