- fixed order of files
- added tests for Extensions