Merge "Increase tests coverage in backend"