Fixes and adds more attribute selector test cases