[WIP] Test Component Integration
Updated mapping
Fixed tests
Fixed mapping
Merge pull request #47 from dantleech/tests

[WIP] Test Component Integration