fixed tests
Merge branch 'maxbranch'
fixed test and removed pendings