Fixing namespaces
Fixing namespaces
Adding missing spec tests to travis
Fixing wrong merges
Merge pull request #620 from jjanvier/components

[Component] Fixes