OZP-10: refactor tests that are failing in IE7