Merge "Add tests for barbican modules and states"