Final Test fix