Added tests for multiple scenarios