Add ID selector
Remove unused imports
Remove now unused tests