Fixed both source and tests in IE 6/7/8