Add tests for complex expressions