Beaker tests fix