Merge "Add tests for gnocchi states and modules"