Updated to latest TestLib