Tests updates; Primitives set through XML
Merge branch 'master' of https://github.com/MrJew/darwin