Second attempt for fixing the failing test