More tests for more scenarios