Fix broken beatrix tests