Merge "Refactor Beaker tests"