Fix tests and add a new one.
Merge branch 'master' of https://github.com/n3phele/core