Added tests for remaining scenarios