Add tests for new cases