Refs #417. Made adjustements so that the test suite passes in IE7.