Fixing combined selectors and adding tests