Change instance mehods to static
Reset environment static variable before each test
Add use statements
Changing files structure
Add use statement
Merge branch 'feature/refactoring' into develop