Small test improvement + build change