Fixed unit tests
Merge branch 'develop' of github.com:octobercms/october into develop