Merge branch 'develop'
Remove redundant test and increase Mocha timeout