Further PDO integration and adaptation of unit tests