Extending unit tests
Fix
Fix
fixing tests