Fixing unit tests
Refactoring actions