Order DB layer and unit tests