[5453] Improved tests