Add beaker tests to complete test plan