Finished complex selectors. Fixed broken tests.