changes and test
package
Merge branch 'dev'
fixted test
removed unused task