[bugfix] Corrected failing tests