fixed file loading
code coverage added
Merge branch 'develop'

* develop:
  code coverage added
  fixed file loading