Test-suite build fixed