Modify beaker tests, but it still needs some test