Modify unit tests to support PDO