Added tests for some use cases and fix them