Improve code coverage with tests
Add test on custom component support