PDO tests improved