Matches flake8, improved unit tests
Merge branch 'datastore_style' into development
Merge branch 'development'