Fixing tests and adding tests for new scenario