Jaydeep - Fixed the tests to use more clear selectors.