Fixing tests and adding more scenarios