Div tests and fixes