Fix onlyif tests