ADD: New tests