Add test file, add component/value dependency, fix issues