Rename component, add tests