Fixed tests

## What? Why?
Tests were failing due to something related with threads management in saving operations

## What should be tested?
Tests are passing and are properly implemented

## Related tasks? 
Non-related tasks