Add beaker tests
Add system tests