Fix some beta test failures within crv distributions
Merge pull request #2 from raoulb/beta_fix_test_failures

Fix some beta test failures within crv distributions