Added attribute selectors, selector macro, more tests