* Update beaker tests to match latest changes