move tests to components, remove duplicates