Merge pull request #145 from hunner/fix_beaker_tests