Merge branch 'fix-mr-29' into 'data-fixtures'

Suggested style fixes for data fixtures

See merge request !30