add unit tests
Merge branch 'master' of https://github.com/unistra/excalibur
correct merge