Add tests for other scenarios