Fix failing tests [RD-97]