Fixed codestyle warnings
Fixed codestyle warnings on tests
Merge branch 'styles' into develop
Merge branch 'develop'