Fixing tests
Merge branch 'master' of https://github.com/n3phele/core