simplify tests, add test cases for iPad popovers